Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ´profiles/suites.nix` and fix hardware module in hosts documentation #291

Merged
merged 2 commits into from
May 18, 2021

Conversation

ymarkus
Copy link
Contributor

@ymarkus ymarkus commented May 18, 2021

See #282

As I understand it, this file isn't needed anymore and the hardware module is not defined properly in the documentation.

Copy link
Member

@Pacman99 Pacman99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow I can't believe I forgot to remove profile/suites.nix. Thank you for catching that!

modules = [ hardware.purism-librem-13v3 ];
modules = [ nixos-hardware.nixosModules.purism-librem-13v3 ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on your other comment from the thread, could you also apply this patch:

diff --git a/doc/concepts/hosts.md b/doc/concepts/hosts.md
index 1fa9028..d9902eb 100644
--- a/doc/concepts/hosts.md
+++ b/doc/concepts/hosts.md
@@ -33,15 +33,15 @@ that you intend to use on your machine.
 flake.nix:
 ```nix
 {
-  nixos.hosts = mkMerge [
-    (devos.lib.importHosts ./hosts)
-    {
+  nixos = {
+    imports = [ (devos.lib.importHosts ./hosts) ];
+    hosts = {
       librem = {
         channelName = "latest";
         modules = [ hardware.purism-librem-13v3 ];
       };
-    }
-  ];
+    };
+  };
 }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to update the doc to match flake.nix

@blaggacao
Copy link
Contributor

blaggacao commented May 18, 2021

@Pacman99 Let's make that other change separate, as this change is a valid bugfix on its own. So including ASAP is of value on its own.

bors r+

@bors
Copy link
Contributor

bors bot commented May 18, 2021

Build succeeded:

@bors bors bot merged commit d1d2a4c into divnix:core May 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants